Merge
authorTim Deegan <tim.deegan@xensource.com>
Thu, 21 Sep 2006 14:04:29 +0000 (15:04 +0100)
committerTim Deegan <tim.deegan@xensource.com>
Thu, 21 Sep 2006 14:04:29 +0000 (15:04 +0100)

Trivial merge